Update upstream source from tag 'upstream/2018.5'
authorSimon McVittie <smcv@debian.org>
Tue, 15 May 2018 10:05:15 +0000 (11:05 +0100)
committerSimon McVittie <smcv@debian.org>
Tue, 15 May 2018 10:05:15 +0000 (11:05 +0100)
Update to upstream version '2018.5'
with Debian dir 743711762b9128a7fa87269fdf826c8c93912a7b


Trivial merge